Merge branch 'wip/otte/for-master' into 'master'

author Benjamin Otte <otte.benjamin@googlemail.com>

Thu, 16 Jul 2020 19:43:45 +0000 (19:43 +0000)

committer Benjamin Otte <otte.benjamin@googlemail.com>

Thu, 16 Jul 2020 19:43:45 +0000 (19:43 +0000)
author Benjamin Otte <otte.benjamin@googlemail.com>
Thu, 16 Jul 2020 19:43:45 +0000 (19:43 +0000)
committer Benjamin Otte <otte.benjamin@googlemail.com>
Thu, 16 Jul 2020 19:43:45 +0000 (19:43 +0000)
diff --cc gtk/gtkprintunixdialog.c
Simple merge
diff --cc testsuite/gtk/filter.c
Simple merge
diff --cc testsuite/gtk/filterlistmodel-exhaustive.c
Simple merge
author	Benjamin Otte <otte.benjamin@googlemail.com>
	Thu, 16 Jul 2020 19:43:45 +0000 (19:43 +0000)
committer	Benjamin Otte <otte.benjamin@googlemail.com>
	Thu, 16 Jul 2020 19:43:45 +0000 (19:43 +0000)
		1	2
gtk/gtkprintunixdialog.c	patch \|	diff1 \|	diff2 \|	blob \| history
testsuite/gtk/filter.c	patch \|	diff1 \|	diff2 \|	blob \| history
testsuite/gtk/filterlistmodel-exhaustive.c	patch \|	diff1 \|	diff2 \|	blob \| history